Add make test-kitodo #63

markusweigelt · 2023-03-10T09:32:02Z

No description provided.

add kitodo test

maybe not necessary cause when we catch the error the tmate session is already closed

markusweigelt · 2023-03-10T09:49:57Z

Atm we call make test and run all test. Possibly only test-kitodo and test-presentation is still necessary as the test-production is indirectly tested by test-kitodo.

bertsky

Excellent!

Makefile

bertsky · 2023-03-10T10:16:06Z

Makefile

+# run asynchronous ocr processing, which should return within 5 seconds with exit status 1
+	timeout --preserve-status 5 docker exec -t `docker container ls -qf name=kitodo-app` bash -c '/usr/local/kitodo/scripts/script_ocr_process_dir.sh "testdata-kitodo" 1'; test $$? -eq 1
+# Check the docker log of the manager if the ocr processing has already been completed. It fails if the ocr processing was not completed within 5 minutes.
+	( timeout 5m docker logs -f `docker container ls -qf name=ocrd-manager` & ) | grep -q "KitodoActiveMQClient"


Very nice recipe!

Makefile

bertsky · 2023-03-10T10:22:43Z

Possibly only test-kitodo and test-presentation is still necessary as the test-production is indirectly tested by test-kitodo.

Yes, but test-production (alone) tests in sync mode, which is good for coverage.

BTW, on the CI we could do make -j test which will run all 3 tests in parallel. To make that work with the Controller, we can either add CONTROLLER_WORKERS=3 make -j test so that they will actually be computed in parallel, or keep the default 1 (which will have each job wait for the previous job to free the semaphore). We could even test both...

Co-authored-by: Robert Sachunsky <[email protected]>

add APP_DATA

markusweigelt · 2023-03-10T13:34:44Z

BTW, on the CI we could do make -j test which will run all 3 tests in parallel. To make that work with the Controller, we can either add CONTROLLER_WORKERS=3 make -j test so that they will actually be computed in parallel, or keep the default 1 (which will have each job wait for the previous job to free the semaphore). We could even test both...

Probably we have to adjust the make call in Makefile too

ocrd_kitodo/Makefile

Line 153 in 6f665a2

$(MAKE) -C _modules/ocrd_manager $@

.

Atm rerunning of test-kitodo without make down and make start is a problem cause we need to flush the manager log to provide the check for KitodoActiveMQClient if ocr processing has finished.

ocrd_kitodo/Makefile

Line 169 in c3d29a5

    
           ( timeout 5m docker logs -f `docker container ls -qf name=ocrd-manager` & ) | grep -q "KitodoActiveMQClient"

truncate -s 0 $(docker inspect --format='{{.LogPath}}' ocrd_kitodo-ocrd-manager-1 ) flush's the log with sudo but probably there are permission issues without sudo at the runner. But i will check this.

bertsky · 2023-03-10T13:47:00Z

Atm rerunning of test-kitodo without make down and make start is a problem cause we need to flush the manager log to provide the check for KitodoActiveMQClient if ocr processing has finished.

indeed.

But truncating the Docker log file is asking for trouble. I'd rather keep it simple and require down-up.

Or is there another way to query the ActiveMQ was received, perhaps something on the process directory?

markusweigelt · 2023-03-10T13:55:14Z

Yes. Instead of testing for existing KitodoActiveMQClient request in log, we can check if the alto files are already in the directory. If they are not present within of 5 minutes, an error will be thrown. We would only have to delete the alto directory before rerun next test.

bertsky · 2023-03-10T14:32:53Z

Yes, sounds good. (Or directly intercept the ActiveMQ result by interacting with our kitodo-mq container?)

change line to ls instead of find

markusweigelt · 2023-03-10T16:41:08Z

Changed the implementation to check for existing of an alto file.

Remove pull_request event trigger cause workflow runs two times.

bertsky

But I really like the ActiveMQ test better!

(Even if that means you cannot easily repeat. And why not try to test directly for the ActiveMQ reply? For example, we could do docker exec kitodo-mq bin/activemq consumer --messageCount 1 ...)

Makefile

Co-authored-by: Robert Sachunsky <[email protected]>

markusweigelt · 2023-03-14T11:48:32Z

Add the issue #64 and merge branch as discussed

markusweigelt added 2 commits March 10, 2023 10:13

Update Makefile

d987150

add kitodo test

Update makefile-ci.yml

c830b63

maybe not necessary cause when we catch the error the tmate session is already closed

markusweigelt requested a review from bertsky March 10, 2023 09:32

bertsky reviewed Mar 10, 2023

View reviewed changes

markusweigelt and others added 6 commits March 10, 2023 11:25

Update Makefile

09dad37

Co-authored-by: Robert Sachunsky <[email protected]>

Update Makefile

d6ca170

Co-authored-by: Robert Sachunsky <[email protected]>

Update Makefile

2c34dc6

Co-authored-by: Robert Sachunsky <[email protected]>

Update Makefile

0614b62

Co-authored-by: Robert Sachunsky <[email protected]>

Update Makefile

0292dd5

add APP_DATA

Update makefile-ci.yml

c3d29a5

markusweigelt added 5 commits March 10, 2023 16:01

Update Makefile

555eb94

Update Makefile

01556da

Update Makefile

d0f67d7

Update Makefile

10f7abe

Update Makefile

c311fbf

change line to ls instead of find

markusweigelt added 3 commits March 10, 2023 17:43

Update makefile-ci.yml

4b4ce5f

Remove pull_request event trigger cause workflow runs two times.

Update makefile-ci.yml

2c6d35f

Update makefile-ci.yml

e2e1584

bertsky reviewed Mar 10, 2023

View reviewed changes

Makefile Outdated Show resolved Hide resolved

Update Makefile

b2232da

Co-authored-by: Robert Sachunsky <[email protected]>

markusweigelt mentioned this pull request Mar 14, 2023

Using active mq make test-kitodo #64

Open

Merge branch 'main' into test-kitodo

d7d495e

markusweigelt merged commit c5b5be8 into main Mar 14, 2023

markusweigelt deleted the test-kitodo branch March 14, 2023 11:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add make test-kitodo #63

Add make test-kitodo #63

markusweigelt commented Mar 10, 2023

markusweigelt commented Mar 10, 2023

bertsky left a comment

bertsky Mar 10, 2023

bertsky commented Mar 10, 2023

markusweigelt commented Mar 10, 2023 •

edited

Loading

bertsky commented Mar 10, 2023

markusweigelt commented Mar 10, 2023

bertsky commented Mar 10, 2023

markusweigelt commented Mar 10, 2023 •

edited

Loading

bertsky left a comment

markusweigelt commented Mar 14, 2023

Add make test-kitodo #63

Add make test-kitodo #63

Conversation

markusweigelt commented Mar 10, 2023

markusweigelt commented Mar 10, 2023

bertsky left a comment

Choose a reason for hiding this comment

bertsky Mar 10, 2023

Choose a reason for hiding this comment

bertsky commented Mar 10, 2023

markusweigelt commented Mar 10, 2023 • edited Loading

bertsky commented Mar 10, 2023

markusweigelt commented Mar 10, 2023

bertsky commented Mar 10, 2023

markusweigelt commented Mar 10, 2023 • edited Loading

bertsky left a comment

Choose a reason for hiding this comment

markusweigelt commented Mar 14, 2023

markusweigelt commented Mar 10, 2023 •

edited

Loading

markusweigelt commented Mar 10, 2023 •

edited

Loading